Renaming and cleanup up a little