Improvements, tidy and shit