Cleaned up code/added polish