Added Cleaner / better code