Code cleanup und simplification
Further code cleanup