Cleaned out and formatted