Re-organized entire class