Added portal commands
Code cleanup