Organized code, fixed bug.