Fixed Style problems