Cleaned up methods, deleted comments