Mostly Code Cleanup for readibility