Code styling + cleanup