Style bugs fixing