space before %>
please don't commit any changes unless I reopen the code 
and do it in one commit for fast reviewing
@AmirGeorge