Added comments for things to improve