changed pricing structure
code cleanup