Code Cleanup. Prepare for next update