Clean up code + Document Methods