Added branch and cleaned up