Improved & cleaner code.