cleaned up style, added aditional hints