Removed unneccessary class and added comments