Code cleanup, added logs to style integration