Includes cleanup + removed comments