Cleaned up code after last commit