Made changes. Cleaned up code.