Code Cleanup + Thomas Padding