indentation and other basic stuff
working code for now