Code Redability Updates