Cleaned out commented code and for readability