magic numbers gone
code style changes
first commit