minor codeadjustments, mostly to improve readablility of the code and stuff