Fix some indentation and add push / pop method.