Style fixes, logs removed