Working through some syntax cleanup and looking for any obvious issues