some changes in your code to make interface more comfortable. what you
think? check it