v0.0.11 ~ refactored long methods, renamed vars