Code cleaning and shit