Some code cleanup (#23)

[bruce-willis]

• code cleanup

• short way for functions

• optimize imports

• optimize when

• delete unneeded code

• code cleanup by Android Studio

• update readme

• split tests