Edited and Cleaned up classes. Next Objective to comment and detail
code.

Signed-off-by: fisherjk <John@John-PC>