Working on cleaning up classes

Signed-off-by: Joshj5hawk <joshj5hawk@gmail.com>