prettier highlighting + some code clean up