code review #1

some ideas for you :)