In general can you please make sure you are not using your own code style. Please adopt to the codestyle which is mainly default SUN except of 4 spaces indent.