clean code
Merge remote-tracking branch 'peekaboo/master'