+ Includes code cleanup + Removed redundant function
Amended for code style by Adam Honse <[email protected]>