making this cleaner and added rockspec