Cleaned up (removed comments etc.)