Cleaning up, adding small stuff here and there :)