Cleaned up and Commented Classes