Small changes making it clean and v2.1.5