Aaand more cleaning up :3