Cleaned up and added specs where needed