Fixed indention
Added support for arguments, and cleaned a bit up