Adding some actions, some cleanup in code