Cleaned out code