Better indentation, changed default marginTiming, cleaned code