remove redundant constant definition
begin work on koala class

Still need to modify start to actually use the new class.
Merge branch 'master' of https://github.com/130610/sd-project