Cleaned up code for distribution to team

Signed-off-by: ScottHaileRobertson <heyemailthis+Git@gmail.com>