refactoring ... (I love you IDEA :D )