Code refactoring

Move code for getting better look.