Better code & Improvements