re-formatted the source code a little bit

and testing too :)