Removed abstracts classes
Cleaned up functions