better organization
code cleanup