Cleaned up look of code