Moved stuff arround, renamed variables and normalized code