Removed unneeded css classes and added small todo