refactor_master

780 karma