Cleaned up code, removed unnecessary class