Code Cleanups etc.