Removed debugging and commented code