Cleaned up code and added method comments